home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
SGI Freeware 2001 May
/
SGI Freeware 2001 May - Disc 2.iso
/
dist
/
fw_tiff.idb
/
usr
/
freeware
/
src
/
tiff
/
patches.z
/
patches
Wrap
Text File
|
1999-04-16
|
4KB
|
142 lines
--- ./man/Makefile.in Tue Sep 2 13:54:41 1997
+++ ../tiff-v3.4beta037/./man/Makefile.in Fri Mar 19 13:55:51 1999
@@ -27,7 +27,7 @@
# LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
# OF THIS SOFTWARE.
#
-SRCDIR = @RELSRCDIR@/man
+override SRCDIR = @RELSRCDIR@/man
#
# VERSION: @VERSION@
--- ./html/Makefile.in Tue Sep 2 13:54:54 1997
+++ ../tiff-v3.4beta037/./html/Makefile.in Fri Mar 19 13:55:33 1999
@@ -28,7 +28,7 @@
#
DEPTH = ..
-SRCDIR = ${DEPTH}/@SRCDIR@/html
+override SRCDIR = ${DEPTH}/@SRCDIR@/html
VPATH = ../@SRCDIR@/html
PORT = ${DEPTH}/port
--- ./port/Makefile.in Tue Sep 2 13:54:32 1997
+++ ../tiff-v3.4beta037/./port/Makefile.in Fri Mar 19 13:55:17 1999
@@ -27,7 +27,7 @@
# LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
# OF THIS SOFTWARE.
#
-SRCDIR = @RELSRCDIR@/port
+override SRCDIR = @RELSRCDIR@/port
VPATH = @RELSRCDIR@/port
#
--- ./Makefile.in Tue Sep 2 13:54:17 1997
+++ ../tiff-v3.4beta037/./Makefile.in Fri Mar 19 13:55:02 1999
@@ -28,7 +28,7 @@
# OF THIS SOFTWARE.
#
-SRCDIR = @SRCDIR@
+override SRCDIR = @SRCDIR@
#
# VERSION: @VERSION@
--- ./libtiff/Makefile.in Tue Sep 2 13:54:19 1997
+++ ../tiff-v3.4beta037/./libtiff/Makefile.in Fri Mar 19 13:54:43 1999
@@ -25,7 +25,7 @@
# OF THIS SOFTWARE.
#
-SRCDIR = @LIBSRCDIR@
+override SRCDIR = @LIBSRCDIR@
#
# VERSION: @VERSION@
--- ./tools/Makefile.in Tue Sep 2 13:54:34 1997
+++ ../tiff-v3.4beta037/./tools/Makefile.in Fri Mar 19 13:54:29 1999
@@ -28,7 +28,7 @@
#
DEPTH = ..
-SRCDIR = @RELSRCDIR@/tools
+override SRCDIR = @RELSRCDIR@/tools
LIBDIR = @RELSRCDIR@/libtiff
#
--- ./configure Tue Sep 2 13:54:16 1997
+++ ../tiff-v3.4beta037/./configure Fri Mar 19 16:58:08 1999
@@ -48,7 +48,7 @@
DIR_LIB=/usr/local/lib # destination for library
DIR_INC=/usr/local/include # destination for include files
DIR_HTML=/var/httpd/htdocs/tiff # destination for HTML files
-DIRS_LIBINC= # dirs to search for ancillary includes
+: ${DIRS_LIBINC=} # dirs to search for ancillary includes
DIR_JPEGLIB= # dir for IJG -ljpeg
DIR_GZLIB= # dir for zlib -lgz
DSO=auto # auto-enable DSO support
@@ -66,7 +66,7 @@
: ${MAKE=make} # make to use
# screws up the test of `-f -'
-: ${MAKEFLAGS=} # unset MAKEFLAGS
+MAKEFLAGS= # unset MAKEFLAGS
RM="rm -f"
#
@@ -391,7 +391,7 @@
#
findApp()
{
- findThing "test -x" $1 $2
+ findThing "test -x" "$1" "$2"
}
#
@@ -486,8 +486,8 @@
checkCompiler()
{
- compiler=$1
- if isGNU $compiler; then
+ compiler="$1"
+ if isGNU "$compiler"; then
ISGCC=yes
else
ISGCC=no
@@ -510,9 +510,9 @@
C_ANSI="$ENVOPTS"
fi
$RM dummy dummy.o
- capture $compiler -o dummy ${C_ANSI} dummy.c && {
+ capture "$compiler" -o dummy ${C_ANSI} dummy.c && {
CC=$compiler;
- test -z "${CCOMPILER-}" && CCOMPILER=`findApp $compiler $PATH`
+ test -z "${CCOMPILER-}" && CCOMPILER=`findApp "$compiler" $PATH`
test -z "${ENVOPTS-}" && ENVOPTS="${C_ANSI-}"
return 0
}
@@ -525,11 +525,11 @@
CCOMPILER=
for i in gcc cc ncc dcc xlc c89 gcc2; do
CCtested="$CCtested $i"
- checkCompiler $i && break
+ checkCompiler "$i" && break
done
else
CCtested="$CCtested $CC"
- checkCompiler $CC
+ checkCompiler "$CC"
fi
if [ -z "$CCOMPILER" ]; then
cat<<EOF
@@ -607,7 +607,7 @@
#
# Verify that $MAKE is accessible
#
-PATHMAKE=`findApp ${MAKE} $PATH`
+PATHMAKE=`findApp "${MAKE}" $PATH`
if [ "$PATHMAKE" ]; then
Note "Using $PATHMAKE to configure the software."
(echo 'all:') | ${MAKE} -f - all >/dev/null 2>&5 || {